API: remove gdk_screen_get_rgb_colormap/visual()

People want to use gdk_screen_get_default_colormap/visual().
Also, GdkRGB is about to die.

diff --git a/docs/reference/gdk/gdk3-sections.txt b/docs/reference/gdk/gdk3-sections.txt
index 2833bbc070fe2d61ded681e2ebbf397f73d2c62f..dddc351cc97d6adda4f501e735cc578fcd323d92 100644 (file)
--- a/docs/reference/gdk/gdk3-sections.txt
+++ b/docs/reference/gdk/gdk3-sections.txt
@@ -202,8 +202,6 @@ gdk_screen_get_default_colormap
 gdk_screen_set_default_colormap
 gdk_screen_get_system_colormap
 gdk_screen_get_system_visual
-gdk_screen_get_rgb_colormap
-gdk_screen_get_rgb_visual
 gdk_screen_get_rgba_colormap
 gdk_screen_get_rgba_visual
 gdk_screen_is_composited

diff --git a/docs/reference/gdk/tmpl/gdkscreen.sgml b/docs/reference/gdk/tmpl/gdkscreen.sgml
index eeeed17c146e439745707488b334925fec62da4c..96055d3ab348ca3816e675ba9c6a815090856467 100644 (file)
--- a/docs/reference/gdk/tmpl/gdkscreen.sgml
+++ b/docs/reference/gdk/tmpl/gdkscreen.sgml
@@ -113,24 +113,6 @@ when GDK gets multihead support.
 @Returns: 
 
 
-<!-- ##### FUNCTION gdk_screen_get_rgb_colormap ##### -->
-<para>
-
-</para>
-
-@screen: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_screen_get_rgb_visual ##### -->
-<para>
-
-</para>
-
-@screen: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gdk_screen_get_rgba_colormap ##### -->
 <para>
 

diff --git a/gdk/gdk.symbols b/gdk/gdk.symbols
index 5b5fb25a3b657c19d5300bc545e8f2d65026c99d..c0eeaa437cc9f191e1956783e4f22545ffede608 100644 (file)
--- a/gdk/gdk.symbols
+++ b/gdk/gdk.symbols
@@ -1016,13 +1016,6 @@ gdk_screen_get_default
 #endif
 #endif
 
-#if IN_HEADER(__GDK_SCREEN_H__)
-#if IN_FILE(__GDK_RGB_C__)
-gdk_screen_get_rgb_colormap
-gdk_screen_get_rgb_visual
-#endif
-#endif
-
 #if IN_HEADER(__GDK_SCREEN_H__)
 #if IN_FILE(__GDK_VISUAL_X11_C__)
 gdk_screen_get_system_visual

diff --git a/gdk/gdkrgb.c b/gdk/gdkrgb.c
index c82f44e9990c5d785db7b8b00df6c3fe6e4ed78e..f21412d5c32cc1774a304d3d9d4499633b3e101d 100644 (file)
--- a/gdk/gdkrgb.c
+++ b/gdk/gdkrgb.c
@@ -3292,6 +3292,22 @@ gdk_draw_rgb_image_core (GdkRgbInfo     *image_info,
     }
 }
 
+static GdkColormap *
+gdk_screen_get_rgb_colormap (GdkScreen *screen)
+{
+  GdkColormap *cmap;
+  g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
+  cmap = g_object_get_data (G_OBJECT (screen), "rgb-colormap"); 
+  if (!cmap)
+    {
+      GdkRgbInfo *image_info = gdk_rgb_create_info (gdk_rgb_choose_visual (screen), NULL);
+      cmap = image_info->cmap;
+      g_object_set_data (G_OBJECT (screen), "rgb-colormap", cmap);
+    }
+
+  return cmap;
+}
+
 static GdkRgbInfo *
 gdk_rgb_get_info_from_drawable (GdkDrawable *drawable)
 {
@@ -3640,58 +3656,6 @@ gdk_rgb_get_colormap (void)
   return cmap;
 }
 
-/**
- * gdk_screen_get_rgb_colormap:
- * @screen: a #GdkScreen.
- * 
- * Gets the preferred colormap for rendering image data on @screen.
- * Not a very useful function; historically, GDK could only render RGB
- * image data to one colormap and visual, but in the current version
- * it can render to any colormap and visual. So there's no need to
- * call this function.
- * 
- * Return value: (transfer none): the preferred colormap
- *
- * Since: 2.2
- **/
-GdkColormap *
-gdk_screen_get_rgb_colormap (GdkScreen *screen)
-{
-  GdkColormap *cmap;
-  g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
-  cmap = g_object_get_data (G_OBJECT (screen), "rgb-colormap"); 
-  if (!cmap)
-    {
-      GdkRgbInfo *image_info = gdk_rgb_create_info (gdk_rgb_choose_visual (screen), NULL);
-      cmap = image_info->cmap;
-      g_object_set_data (G_OBJECT (screen), "rgb-colormap", cmap);
-    }
-
-  return cmap;
-}
-
-/**
- * gdk_screen_get_rgb_visual:
- * @screen: a #GdkScreen
- * 
- * Gets a "preferred visual" chosen by GdkRGB for rendering image data
- * on @screen. In previous versions of
- * GDK, this was the only visual GdkRGB could use for rendering. In
- * current versions, it's simply the visual GdkRGB would have chosen as 
- * the optimal one in those previous versions. GdkRGB can now render to 
- * drawables with any visual.
- * 
- * Return value: (transfer none): The #GdkVisual chosen by GdkRGB.
- *
- * Since: 2.2
- **/
-GdkVisual *
-gdk_screen_get_rgb_visual (GdkScreen *screen)
-{
-  g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
-  return gdk_colormap_get_visual (gdk_screen_get_rgb_colormap (screen));
-}
-
 /**
  * gdk_rgb_get_visual:
  * 
@@ -3707,5 +3671,5 @@ gdk_screen_get_rgb_visual (GdkScreen *screen)
 GdkVisual *
 gdk_rgb_get_visual (void)
 {
-  return gdk_screen_get_rgb_visual (gdk_screen_get_default ());
+  return gdk_colormap_get_visual (gdk_screen_get_rgb_colormap (gdk_screen_get_default ()));
 }

diff --git a/gdk/gdkscreen.h b/gdk/gdkscreen.h
index 200d643a6fda10845e630a4df5cc4b3dad82ae53..ac6834ac12dfc5b83c1415f15d2a63012a9485a5 100644 (file)
--- a/gdk/gdkscreen.h
+++ b/gdk/gdkscreen.h
@@ -72,8 +72,6 @@ void         gdk_screen_set_default_colormap  (GdkScreen   *screen,
                                               GdkColormap *colormap);
 GdkColormap* gdk_screen_get_system_colormap   (GdkScreen   *screen);
 GdkVisual*   gdk_screen_get_system_visual     (GdkScreen   *screen);
-GdkColormap *gdk_screen_get_rgb_colormap      (GdkScreen   *screen);
-GdkVisual *  gdk_screen_get_rgb_visual        (GdkScreen   *screen);
 GdkColormap *gdk_screen_get_rgba_colormap     (GdkScreen   *screen);
 GdkVisual *  gdk_screen_get_rgba_visual       (GdkScreen   *screen);
 gboolean     gdk_screen_is_composited        (GdkScreen   *screen);

diff --git a/gtk/gtktrayicon-x11.c b/gtk/gtktrayicon-x11.c
index 7013e44b939b9ef63ca035ec972c30f316df8c63..5e7a75cf3b7df07afaa814534c72e43086fb380f 100644 (file)
--- a/gtk/gtktrayicon-x11.c
+++ b/gtk/gtktrayicon-x11.c
@@ -829,8 +829,6 @@ gtk_tray_icon_set_colormap (GtkTrayIcon *icon)
 
   if (visual == NULL || visual == gdk_screen_get_system_visual (screen))
     colormap = gdk_screen_get_system_colormap (screen);
-  else if (visual == gdk_screen_get_rgb_visual (screen))
-    colormap = gdk_screen_get_rgb_colormap (screen);
   else if (visual == gdk_screen_get_rgba_visual (screen))
     colormap = gdk_screen_get_rgba_colormap (screen);
   else